Conversation
[Deploy] 환경변수 수정
[codex] Prepare EC2 hosting
[codex] Prepare EC2 Docker Compose deployment
[codex] Prepare EC2 backend deployment
Main to Deploy
…dback [codex] Add account deletion feedback
Main to Deploy
…gle-users [codex] Handle duplicate Google social users
…en-length [codex] Fix social login token storage
…ken-version [codex] Fix Flyway migration version conflict
…ization [codex] Fix Firebase initialization lifecycle hook
…o-deploy # Conflicts: # .github/workflows/deploy.yml # ontime-back/Dockerfile # ontime-back/docker-compose.yml # ontime-back/src/main/java/devkor/ontime_back/config/FirebaseInitialization.java # ontime-back/src/main/java/devkor/ontime_back/global/generallogin/handler/LoginSuccessHandler.java # ontime-back/src/main/java/devkor/ontime_back/global/jwt/JwtTokenProvider.java # ontime-back/src/main/java/devkor/ontime_back/global/oauth/apple/AppleLoginService.java
Merge main into deploy
…b-config [codex] Harden production database configuration
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Syncs the current deploy branch back into main before retiring deploy in favor of the dev -> main workflow.\n\nSafety tag created: archive/deploy-before-retire-2026-05-07